Merge changes made in Gnus trunk.
authorGnus developers <>
Mon, 4 Oct 2010 10:16:57 +0000 (10:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 4 Oct 2010 10:16:57 +0000 (10:16 +0000)
commitb4f345ca121ba1cd3e1a896452f837db0d0b35ba
tree16bf60ff58abda2001ad12e582240558c70c0b13
parent47c2e0af00f2f56c223ed2a1869e3b044db8f1cb
Merge changes made in Gnus trunk.

gnus-html.el (gnus-html-put-image): Fix resize image code.
shr.el (shr-ensure-paragraph): Fix the non-empty line case.
lisp/gnus/ChangeLog
lisp/gnus/gnus-html.el
lisp/gnus/shr.el